[automerger skipped] Merge changes from topic "am-9df32e455d9e41a482aaf621f1c9ea48" into rvc-d1-dev-plus-aosp am: caac5d94 -s ours
am skip reason: Change-Id Ib42222f29a7a75f552cc886437b8967f195227b5 with SHA-1 5bb77e1e is in history
Change-Id: I2180162273e92e85550b5230f5372dca89d0c84c