Merge "Merge "docs: Fixed broken link to Android KeyStore facility" into...
Merge "Merge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev am: b38bfa16" into nyc-dev-plus-aosp
am: 2fa074bc
Change-Id: Iec4f24a9d55bbf823eb65d595f27fe2a41712dca