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