[automerger skipped] Merge "Fixing Keymaster documentation." into pie-vts-dev am: 33f7970672
am: 8ee59f2aa6  -s ours

Change-Id: I3b8774b3e01c332b830e3aebf6dbe504a430fdfa