Merge "RESTRICT AUTOMERGE Adding MANAGE_COMPANION_DEVICES to permissions to skip on older versions of the code." into android10-tests-dev