Keystore 2.0: Remove keystore2.enable property. Bug: 171563717 Test: N/A Change-Id: Id24638fda52f4858ac04df18973fafd6e198d55a