Merge "DO NOT MERGE Improve DynamicConfig file copying" into nougat-cts-dev am: 4a3aac2f55  -s ours am: 483dcd2c6d am: 4f1c0acb8c  -s ours am: 1cd331785f am: de1510db38
am: 97d04de53b  -s ours

Change-Id: I9ed646364050a5f250cc72136bf09b9e2d7a26c4