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

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

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

Change-Id: I66fad600246cb5cc0c5d99f7f15e6774ffa8c28d