[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: 8462ebeb am: d407c4ff -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: I28364fa7d4efe4c2bb56d58c1f70f0d33f05b722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>