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