[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 98f78c885d am: 8841a83d1a -s ours
am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 75d59e2c83 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23330385
Change-Id: Id47a910c3615887d70995867eda1648ca948aa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: