[automerger skipped] Merge changes from topic "am-dc97ba98da6e44d8a3e7f2fa0761a4fe" into rvc-d1-dev-plus-aosp am: a89fad79 -s ours
am skip reason: Change-Id Id0877476f9ae23311d92c0b59a9c568140ab4119 with SHA-1 4de27a57 is in history
Change-Id: I068b6d1d34b493527112c94d50be89951b30a688