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

Change-Id: I304332f8a9bfa3a11f0bfbd84dfefc36f98b5886