Merge "Merge "DO NOT MERGE ANYWHERE Add test for files in no_backup folder." into nougat-cts-dev am: 9ec2b447ae  -s ours" into nougat-mr1-cts-dev