Merge changes from topic "presubmit-am-0dab591a2da0487e86ae54ea1577f29a" into sc-v2-dev-plus-aosp am: 747d2520 am: 976698dd am: b8074e1c

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16989257

Change-Id: Id988404435fb5aa49fc50e994ed1665e7d23c7bb