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