Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041



Change-Id: I7b595965ee4220c66b1d3a7b78d74a868159938a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>