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