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