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