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