Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51 am: d0fd20654c am: 7a3eedb0dd am: a40a55aa3e am: 5e71ed7b5a

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

Change-Id: I8dda6f775e995b9f79a1f49cb2747004bf9dc29b