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