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

Merge "Merge "Preserve flags for non-runtime permissions upon package update." into udc-dev am: b4bec96d am: 7d92cd50" into udc-d1-dev-plus-aosp am: d6297d9b

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



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