[automerger skipped] Merge changes from topic "am-e2b3487408664f319470a8b3f994e38d" into rvc-d1-dev-plus-aosp am: e4e08a07 -s ours
am skip reason: Change-Id Iba48c173bdea2d55d8f2aa7f0fa382628582fe1c with SHA-1 5c8a5051 is in history
Change-Id: Iadcfe70860877fe7caf2fbf26b6648a09d0ff3ca