[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 skip reason: subject contains skip directive

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

Change-Id: Iefa91aecb42c4be93e85e1186bb67f8df889953d