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

Change-Id: I2c7dd0da8fbb604751dd7b142ed9ec756867e93b