[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 am: ad7254da -s ours
am skip reason: Change-Id I36818fdc0f7732174fc7b2fd7619b1ae75b5b33d with SHA-1 1cc355b5 is in history
Change-Id: I1092f4449f255e3b31a5f1ebc104d48d97209c2d