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