[automerger skipped] Merge "Fixed EmulatedUserHal merge issues." into...

[automerger skipped] Merge "Fixed EmulatedUserHal merge issues." into rvc-qpr-dev am: 99c45fff -s ours am: 0a7f7b3d -s ours

am skip reason: Change-Id I5c8b99b8027b5ec10ace323d872cd85f9a0d4177 with SHA-1 f9aa2393 is in history

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

Change-Id: I8d02b182900561d0a5564b95cdb568a6afeb496c