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