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