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