[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 am: d6170bc6eb am: d0e6ff079d am: 212e31e0bb -s ours am: 051f2605a1 -s ours am: 5c291cbbd4

Original change: https://android-review.googlesource.com/c/platform/cts/+/1323683

Change-Id: Icc7f41e0a8d7391e3725c57e3223112c514201d8