Merge "DO NOT MERGE Updated the SecurityPatchTest to look for a minimum date of 2016-05" into marshmallow-cts-dev am: 6109e13334  -s ours am: b004ea722b
am: d70902ff92

* commit 'd70902ff9211cafe366dfd5b45da4bb0f3f71af0':
  DO NOT MERGE Updated the SecurityPatchTest to look for a minimum date of 2016-05

Change-Id: I6944b31505a399fcb7cba899d65b8c081d2338be