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