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