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