[automerger skipped] Merge changes from topic "ps 2.0 cp" am: a47bf3b8 am: 1ddca01c am: d0f6673a -s ours

am skip reason: Change-Id I6abacd82d9bcbc5957dcad891ae5c742bc307316 with SHA-1 71c6f8ba is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I570bbf4a987ade7a0af7565ed7b6121089ec9fba