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: 7d92cd50

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



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