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