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