[automerger skipped] Merge "DO NOT MERGE: Remove requirement for optional system activity intents" into oreo-mr1-cts-dev
am: 0ea440c0a5  -s ours

Change-Id: I5c73ccb567549310198fe337203e9f5de91821f7