Merge changes from topic "presubmit-am-b691d4ec59ca4f32b52225122b2677e9" into sc-v2-dev-plus-aosp am: dec787ddaa am: 20d649efeb am: 0d8c92284d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17678981 Change-Id: I062425f98116a63160d0aa38ca5eb22bc6ebe196 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: