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