Merge "CDD: Requirements for services that have access to "android.permission.RECOVER_KEYSTORE"" into pi-dev
am: b7aeb54de3

Change-Id: I78c5eedbb694de74d14c91adac66bccf1774243a