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