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