[automerger skipped] Merge changes I5edfdc98,I42b87bf9 into android10-tests-dev am: 36887658 -s ours

am skip reason: Change-Id I5edfdc98991068eac279975397b6a29313bf31da with SHA-1 4335de4c is in history

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

Change-Id: I3253e6124f419b639098bbfcfb6b419dc77fc586