Merge "Merge "Merge "[automerger skipped] Merge "Remove testSecurityPatchDate as it is in GTS now." into marshmallow-cts-dev am: 6d743a4383  -s ours" into nougat-cts-dev am: 17fbc64377  -s ours" into nougat-mr1-cts-dev am: 7ca78c7f23  -s ours" into oreo-cts-dev
am: c85b97c629  -s ours

Change-Id: I46e5f40e56b4fb122f2e2d274e0eee1f2f0d280a