Merge "Schematize Crypto state system property"
am: 0441d2cd56

Change-Id: I794c8ff545cb5829d161cfd8cc5bdedd2415d815
tree: 078ae4a135a58d5fafa3deda9c0d366cff041198
  1. QuickSettings/
  2. Settings/
  3. OWNERS
  4. PREUPLOAD.cfg