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