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

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



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