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