Merge "Made UsePermissionTest 26 use correct Manifest"
am: e1c26c079c

Change-Id: I647abf0fc7bab398e2a60f398673b7adca668550