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