Preserve flags for non-runtime permissions upon package update. am: 4ebd48959c

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

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