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