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

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



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