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