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