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