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