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

[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 98f78c88 am: 8841a83d -s ours am: e058e23e -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: I2c5da56c8efb02bb9209029e4f1eea15c9fe5d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>