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