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