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