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