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