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