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