Merge "Support prebuilt non-system IMEs in setPermittedInputMethods test" into oreo-cts-dev am: c7da12619c
am: 5d9c95a2c7

Change-Id: I1f00d93a74fb7d88c817ba3af9eb700b7aaeba3a