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

Change-Id: I6ca593ed2b1031d1fa752ee47b45e413c1df5ad7