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