Merge "Add IntentTest whitelist DynamicConfig" into oc-dev
am: 00b3a04ddb

Change-Id: I5995ba0cf617850e04bbd773e0ca423928b26fa1