[automerger skipped] Merge changes from topic "am-8dce09fc2a32478ebc8e082799678838" into rvc-d1-dev-plus-aosp am: b13bf324 -s ours
am skip reason: Change-Id Ia66591f816aac0d8aad5c1b5b9a0aeff2cc80185 with SHA-1 40fae84d is in history
Change-Id: I8f7860a0e0eee7d535095f0ae98b7831eb474cd1