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