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