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