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