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