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