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