commit 0f0a85ab6b8872b0d7bd8d902a676ad5fe0ee232
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 07 19:04:42 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 07 19:04:42 2022 +0000
tree 75c0b0c86382198aec8d3b0d76fbb199cfac5361
parent 52e326414af4e32449c50aaeb1eee53235d4940b
parent f434833b5c1f9fcf86bdb5f0b7ef0f74ad9142c6

Merge changes from topic "am-5074617c2f0c4e878864a5214727db41" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 082b55bd3f -s ours am: a413c4e721 -s ours am: 4bbbdad2dd -s ours am: a0ed5d7b0b -s ours
  [automerger skipped] [automerge] Fix system zen rules by using owner package name if caller is system 2p: 78245566a2 am: 1fc1ca859c -s ours am: f0fb69e078 -s ours am: cee7799d25 -s ours am: a4b19e8c55 -s ours