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