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