[automerger skipped] Merge changes from topic "am-8dce09fc2a32478ebc8e082799678838" into rvc-d1-dev-plus-aosp am: b13bf32455 -s ours am: 4923320898 -s ours

am skip reason: Change-Id Ia66591f816aac0d8aad5c1b5b9a0aeff2cc80185 with SHA-1 40fae84d5e is in history

Change-Id: I00874d26c29fc199b597f20fd0e41a8d52a532c9