Merge changes I2f5187bf,Icb79e1e0,I833894d3,I54dcaa61,I47a810f2 am: b39baeaa92 am: 319cf92322 am: ab9655adc7 am: ea7e8f4235

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

Change-Id: I253bde5e790e7ec8cf6d0148b67d431453549bc4