[automerger skipped] Merge changes from topic "am-671be3453f2144558f9d58f1cdf12fcd" into rvc-d1-dev-plus-aosp am: 74603cc621 -s ours

am skip reason: Change-Id Ida0f457c03246082673dccc9df7e9b1562ed1636 with SHA-1 6fcd36ec17 is in history

Change-Id: I27603ca3e94be7769c612d9ecd709ba4a7744fd7