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