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