[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 am: 8f5ec52fb5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I31d0ddb4d82a6ed657a0f6f521051fe8d2eaaa23