Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev am: 4d1b57dad3
am: 4e7fbda633

Change-Id: If8c6f98bc40afd40428888c9d01665e59749660e