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