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