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