Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51

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

Change-Id: Ibde5dde9c389f615719e6dff2d61aa37792c205f