Merge changes from topic "ps 2.0 cp" am: a47bf3b8ad am: 1ddca01c5f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b7831e07951931e190c7881792a77f4fd0f8f10