[automerger skipped] Merge "Add vintf_fragments to keymaster@4.1-service" into...
[automerger skipped] Merge "Add vintf_fragments to keymaster@4.1-service" into rvc-dev am: 62a2f62a -s ours am: b70670df -s ours
am skip reason: Change-Id I36818fdc0f7732174fc7b2fd7619b1ae75b5b33d with SHA-1 1cc355b5 is in history
Change-Id: I5c808163a734f3acd15e2188e6ad703d9dcd34a3