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