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