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