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