Merge "[conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad87d am: 0876fa0374" into tm-qpr-dev