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