Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2239018 Change-Id: I66061035b75fab12147355912138b0f3b1219669 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>