[automerger skipped] Merge changes from topic "freeze-aosp-hal" into rvc-dev...
[automerger skipped] Merge changes from topic "freeze-aosp-hal" into rvc-dev am: 4880972d -s ours am: 69221d8f -s ours
am skip reason: Change-Id I643c25fc695f9d1e874dcceb327d465c49e9cab6 with SHA-1 a73d6bc9 is in history
Change-Id: I1752a9008cbc9f5f629767e6a4b2ea14b12b22f8