Merge "RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service" into tm-dev