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