commit 998b6d7ed50aed06cab79811ea8fd76dd7442536
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 27 18:16:26 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 27 18:16:26 2022 +0000
tree b3812009c94a83ecf6573531240a33f334919104
parent 960d48e55ecd762ad76d9cfe872935a3524d8b29
parent 5b7ac88e6021a12087b1c142587e73ed33a2d932

Merge changes from topic "am-87ba0bd5a0544be995d83469f712674f"

* changes:
  [automerger skipped] Merge changes If537a25e,Iee14d6ee,Iac718a6a,I0aae9bb4 into tm-qpr-dev am: 36a9b7e455 am: c2bd56b2a4 -s ours
  [automerger skipped] Override config should trigger intervention ignoring opt-in info am: 5abb52c166 am: 57c2940933 -s ours
  [automerger skipped] Guard the mode configs map in GamePackageConfiguration with lock am: 1ddd0c1b95 am: 7b3207a20b -s ours
  [automerger skipped] Check if it's game package before updating configs am: 8e04d2c100 am: 66e8cf3f4a -s ours