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

Change-Id: I2d86b0a446b1d1c80e8c3b99b7af7bf1caa05e0b