Merge "Do not restrict .fs-verity keyring in debuggable build"
am: be51525424

Change-Id: I544db4a4e13de0fe680a15814c139155c32bf093