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