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

Change-Id: I64ca6373a5c0add1cf26d543175f66fea65cf544