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

Change-Id: I2b4fcba1aaac482329c43a6e4dec03d13b1bc00d