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