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