Merge "DO NOT MERGE ANYWHERE: Update CTS to 6.0R7" into marshmallow-cts-dev am: 97d1c2ed69  -s ours am: a01b5deaca  -s ours am: fe6117d489  -s ours am: 13576cf066  -s ours
am: 6cab0ba3c0  -s ours

* commit '6cab0ba3c0068e8142805c0b4fdf9476005a9a2e':
  DO NOT MERGE ANYWHERE: Update CTS to 6.0R7

Change-Id: I93989e19e306f01006e7393fdeae1bd9aff68da2