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