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