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