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