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