Merge changes from topic "am-cf1cb06807234ac4916525a562b6c364" into main

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Autofill Inflating as User 0" into tm-dev am: f66d59dd am: 6f9f7fe7 am: 6f1630fd -s ours am: ed8a89e2 -s ours am: 2d2ba882 -s ours am: f7b6ddc5 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Fix Autofill Inflating as User 0 am: 16d1ab27 -s ours am: 6f63c347 -s ours am: 00d7d7b0 -s ours am: 4b64b61b -s ours am: dae8e0f7 -s ours am: 441adfa9 -s ours