Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev
am: 1c4d0287c5

Change-Id: I9d808f184b1b0cc2686953bed70977619a45284b