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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e29e01984938820f224d9cf5ff05307d0ebe4ea