Merge "CTS test for Android Security b/72334263 b/38195738 b/36590192" into nyc-mr2-dev