Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813180



Change-Id: Idcc4b08d3119e37f26950a369b43b54292d8234b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>