Merge changes I2f5187bf,Icb79e1e0,I833894d3,I54dcaa61,I47a810f2 am: b39baeaa92

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

Change-Id: I49d546f84e6082527b3320e5cf9ab3bfc629d0d8