Merge "[automerger skipped] Merge "Add vintf_fragments to...

Merge "[automerger skipped] Merge "Add vintf_fragments to keymaster@4.1-service" into rvc-dev am: 62a2f62a am: ad7254da -s ours" into rvc-d1-dev-plus-aosp am: 1890898a -s ours

am skip reason: Change-Id I36818fdc0f7732174fc7b2fd7619b1ae75b5b33d with SHA-1 1cc355b5 is in history

Change-Id: I61e65e53cb08a6051774e75c7dba70d02baba79a