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