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