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: 397ff21d

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



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