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

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

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

Change-Id: Ieee496c8a6ffecc3c95e1a51269b8aa16d63e28b