Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416381 Change-Id: Ic637e5b26c0bb2561497dfb7ba1cf5300bd6af99 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>