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

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

Change-Id: I06d157bc36c44733817f890331acfe50152f7df3