[automerger skipped] Merge changes from topic "am-11d75c56d938476ab6f718fc0579e0a9" into rvc-d1-dev-plus-aosp am: a96d1dce -s ours am: 2a279521 -s ours

am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 d4d035d6 is in history

Change-Id: I899f29a2623887f9907b2543f0a3dbeeb5addfa4