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

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



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