[automerger skipped] Revert "Apply test changes related to flag cleanup." am:...

[automerger skipped] Revert "Apply test changes related to flag cleanup." am: 76dfc7f0 am: 530b2d36 am: 70081579 am: 906d8b06 -s ours

am skip reason: Merged-In I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 with SHA-1 634854be is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2792954

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2796116



Change-Id: I54c22ebf48e298d1189b9f5bfd1a1188c6d09627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>