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