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

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



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