Merge changes I6c1af92f,Icf594d40 into rvc-dev-plus-aosp am: ea758da957 am: cd4510d8d8

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

Change-Id: Ib578973b70dedc14bbc74c94e977aa0039aabf81