[automerger skipped] Merge changes from topic "am-c2cb4c0f3ab84530991868dc5fd89fe9" into rvc-d1-dev-plus-aosp am: 0074af0c -s ours am: 5bf71dfb -s ours

am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 833f4f6f is in history

Change-Id: If6ab7cd0fb6c6381d279194617a21b26a527071a