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