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