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

Change-Id: I7ca7153a902ca0cc2ee83e1f967ffdc392a0658e