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