Merge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev am: b38bfa1679 am: 8a926a602b
am: 4ed0f40a0d

Change-Id: I447459b0f59c2a1cc646a777ae9375e6d4dca4c5