Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp