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