Merge "DO NOT MERGE Improve DynamicConfig file copying" into nougat-mr1-cts-dev
am: 1774f07f6e  -s ours

Change-Id: Iae25069fec5eb0cf61dfc37a704138e818e77dea