Merge "DO NOT MERGE Fixing layout of security, sensors & projection in CTS Verifier." into nougat-mr1-cts-dev