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