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