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

[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 0e1ebd84 am: 19281f9b am: 95dcc1c3 -s ours am: 92e32f91 -s ours

am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 4ebd4895 is already in history

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



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