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