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

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



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