Preserve flags for non-runtime permissions upon package update. am: 0e1ebd84

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



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