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