[automerger skipped] Merge changes I33036387,I63ca8d29 into sc-dev am: 7ef2cee424 am: 7f784959cb -s ours

am skip reason: Merged-In I33036387c243b21ab0ecd49221b7e7757598913e with SHA-1 308916bfaf is already in history

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

Change-Id: Ifc2de22d51c6af1201fab7275657c8fa60a65fd5