[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-21719dfe49114554b602469fa0bd951d" into sc-dev am: 9748ca8e -s ours

am skip reason: Change-Id Ife08409e9b46420685a1ccb0b3256286c973dbf5 with SHA-1 b38bb4f1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a4ef394a1772d3bf0db9650b8c4b23928df74c