Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS Verifier." into nougat-mr1-cts-dev am: 2ded8683c7  -s ours am: 683a7684dc
am: 03b2f79972

Change-Id: I5b07f5673fe2044c72c17ef5595dbe186bc63721