Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev
am: 364dbf1c9e

Change-Id: I6ad01aa0dace567c6c6da67435213bbe8a9e63f3