Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev am: 799c3a62f7
am: 266c2c91ce

Change-Id: I63c60a85ee4739763170e366f432cad10fc31b75