Revert "Apply test changes related to flag cleanup." am: 76dfc7f0 am: 88cd16b2 am: a87350cd

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



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