Merge changes Ic0d7b4d2,I3441e630,Ie504e687 into rvc-dev am: 2e5dd7ab32 am: 0fd2d1e936 am: 0b47a00e13

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

Change-Id: I54551ed0e244fc9423ed2d14b58a244771cff643