Apply test changes related to flag cleanup. am: 92deeb6e am: 0eb3f4d9

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



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