[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 4ebd4895 am: 0d425f76 -s ours am: 3288cf2f -s ours am: e748eb39 -s ours am: 5fc11e26 -s ours

am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 0e1ebd84 is already in history

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



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