Merge "Merge "Merge "Added missing permission to test manifest file." into nougat-cts-dev am: 3dfba7e9fb" into nougat-mr1-cts-dev am: a475bbb388" into oreo-cts-dev