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