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