[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 4ebd48959c am: a1a0b8e38d -s ours am: c064dbd655 -s ours

am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 98f78c885d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23327545

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