Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Support prebuilt non-system IMEs in setPermittedInputMethods test" into nougat-mr1-cts-dev am: 8620594ab5 -s ours am skip reason: subject contains skip directive" into oreo-cts-dev