Merge "DO NOT MERGE ANYWHERE Add test for files in no_backup folder." into nougat-cts-dev am: 9ec2b447ae  -s ours am: b5619c4a07  -s ours am: 243b1bbe55  -s ours am: 35bd999739  -s ours
am: 6970709354  -s ours

Change-Id: I34ed2b54eca63b4c8da2bbf35707023ae1f6a100