Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Adding MANAGE_COMPANION_DEVICES to permissions to skip on older versions of the code." into oreo-cts-dev am: d3b14b1286 -s ours" into oreo-mr1-cts-dev