[automerger skipped] Merge changes from topic "am-096409bf8d7c4205ac98667e05c41e29" into rvc-d1-dev-plus-aosp am: fc1cc4ed -s ours
am skip reason: Change-Id I57cb2003dd75b0bc5528978fd131730273e37a43 with SHA-1 ecfb05d4 is in history
Change-Id: I8926868a056e95d4c71a825c815004c900ac9ec0