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