Merge changes from topic "presubmit-am-9657069f584e4ed1b6ebce8b6d82a21e" into sc-v2-dev-plus-aosp am: 4547737198 am: 722fe369e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17625483 Change-Id: Ie1a27ca74e34298b0b093fe5d71a3f30c551c4b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: