[automerger skipped] Preserve flags for non-runtime permissions upon package update. am: 0e1ebd84e2 am: 19281f9b81 am: 95dcc1c36e -s ours am: 92e32f91af -s ours am: 3885f5bc0b -s ours am: 42032de13d -s ours am: 08abe7a653 -s ours am: 11355ba535 -s ours am: 2c04684081 -s ours am: 80f0b1c665 -s ours
am skip reason: Merged-In Iea3c66710e7d28c6fc730b1939da64f1172b08db with SHA-1 4ebd48959c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23331796
Change-Id: I452e73b49adc55e4d76dcf02138a30e81e6f15fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: