Merge "Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f  -s ours" into nougat-cts-dev am: 6754facde4  -s ours am: 54d3d82d20 am: fecb49089b am: c99b9418c4 am: a3f6d35d88
am: a6fc53fc15  -s ours

Change-Id: Ib313044f87323b1eb023a0bbbb0c3eead999fa82