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