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