Revert "Apply test changes related to flag cleanup." am: 76dfc7f0 am: 530b2d36

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



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