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

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



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