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

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

Change-Id: Ifa7fc9d2123ad2f826324d44924c065c955f4f40