Merge changes from topic "presubmit-am-9d5ed059f6d04c20b6b6c9f357d33061" into sc-v2-dev-plus-aosp am: d47054eb13

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17110451

Change-Id: I470afb6673c83a50fa18ad283b44915f88ff2423