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

Change-Id: Ibb0e645b6301486d7173cef5fd147d4dff75a9e8