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