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

Change-Id: I07106b9b06f290d6d464a8d5bfbf82d90e95e000