[automerger skipped] Merge changes from topic "am-4eabf176cd58440fb467eae04275e30d" into rvc-d1-dev-plus-aosp am: 20438a2d -s ours am: 900e98a2 -s ours

am skip reason: Change-Id I64f0866fee078aa8b246c527c3c1196c8380783f with SHA-1 212a5f0e is in history

Change-Id: Ia7ca8084b400766609afbb5e4b6dc776b1c25272