Merge changes Ic0d7b4d2,I3441e630,Ie504e687 into rvc-dev am: 2e5dd7ab am: e8303a53 am: f7da50ba am: 3f9ceadb

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

Change-Id: I11e3200bce4bbdf601d9fc276e13865e0f56ac62