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