Merge changes I390aa702,I9084343c am: 0c77e4d25a am: 35f97c33b6 am: e8d2915ffc am: 39e0ac2680

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

Change-Id: I2d77da9d077fca149e0409122659c5e623ec248b