Merge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev am: b38bfa1679 am: 8a926a602b am: 4ed0f40a0d am: 77479400bf
am: b2f2d3937e

Change-Id: I6495901a565147ba65539f144c0bac155380c5eb