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

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



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