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