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