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