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