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