DO NOT MERGE ANYWHERE Allow either version of the manifest to be "valid"

On pre-patched, O, devices, the old manifest [the one without
"ephemeral" in the permission] is valid. On post-patched devices
[regardless of version], the new manifest [the one with "ephemeral"
in the permission] is valid.

Change-Id: I1aaa5c55f9e878fe98d049fa870297cabbcfd700
Fixes: 77997418
Test: cts-tradefed run commandAndExit cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest
2 files changed