Preserve flags for non-runtime permissions upon package update. am: 98f78c88

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



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