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: 397ff21d" into udc-d1-dev-plus-aosp am: b3c0087b

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



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