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

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

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

Change-Id: I896c26492cb35ee169adbcae4155f27acb6fffe6