Apply test changes related to flag cleanup. am: 92deeb6e am: a53684e3 am: f71cd23b

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



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