[automerger skipped] Merge "DO NOT MERGE Skip of testEncryption with FEATURE_AUTOMOTIVE" into oreo-mr1-cts-dev
am: d429a9f6c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I87b948461f73b55ad0f6054d26a91d799eb173af