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

[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 4ebd4895 am: a1a0b8e3 -s ours am: c064dbd6 -s ours am: 149c5189 -s ours

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

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



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