Merge "DO NOT MERGE: Remove requirement for optional system activity intents" into oreo-mr1-cts-dev