Merge "Preserve flags for non-runtime permissions upon package update." into...

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

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



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