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