[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-125395c1a55c4e859af27656b2c26312", "presubmit-am-b14104e5e9774385913debfdc01994b2" into sc-v2-dev-plus-aosp am: d2b51ce4 -s ours

am skip reason: Merged-In If9ca733dd21128706f2a9f62e8460b1286631aa5 with SHA-1 f2493a3c is already in history

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

Change-Id: I0784060cad1f847ff8f206147785b279e8a974e8