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