Merge changes I6c1af92f,Icf594d40 am: e6849d568a

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

Change-Id: I215b9462e277696c8456f70c4cab3bd9270863dc