Merge "[automerger skipped] Merge "Revert "Revert "RESTRICT AUTOMERGE""" into pi-dev am: a1d9c0c414 -s ours am: d968b3eaa1 am: b6ff9d95c0 am: 475257aa86" into qt-qpr1-dev-plus-aosp