Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev

author Dmitry Dementyev <dementyev@google.com>

Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)
author Dmitry Dementyev <dementyev@google.com>
Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)
diff --cc services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
Simple merge
author	Dmitry Dementyev <dementyev@google.com>
	Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)