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 am: f4749dfc

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



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