Merge changes I33036387,I63ca8d29 am: aedb92d5af

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

Change-Id: I4bcedfc0236432936be0d06dfb68b987818815ff