[automerger skipped] Preserve flags for non-runtime permissions upon package...

[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 98f78c88 -s ours am: fbc9e83e -s ours am: 976bdcb1 -s ours

am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 75d59e2c is already in history

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



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