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