[automerger skipped] Test preserving flags for non-runtime permissions upon package update. am: 37cd35cc16 am: dcde5b572c am: 09fe29b058 -s ours am: 56fcc8a0ff -s ours am: 6790664018 -s ours

am skip reason: Merged-In I86222fcc2c9cdb1b38b0332a238ee86462f1bfd9 with SHA-1 abdac043f9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23331700

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