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

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



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