[automerger skipped] Merge "Add telecom test-commands for maintaining role overrides." am: d2d1a5a23e am: eacfc9fd85
am: f374fdcb83  -s ours

Change-Id: I5d92e11da24a80a2e912f3b5b78e36e36c830246