Merge "Preserve flags for non-runtime permissions upon package update." into udc-dev am: b4bec96d

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



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