[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

Change-Id: Ica61f02df0957b8ac2d4147049cc71558cfccfde