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