Merge "Unhide getKey() and importKey() and the whole class of...
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev am: 3b0450d4
am: 12c26fc5
Change-Id: I46b57bd17237f75323f56c1bd690132872bb75f4