Merge "Merge "DO NOT MERGE ANYWHERE: Update CTS to 5.0R7" into lollipop-cts-dev am: 15340ed38b  -s ours" into lollipop-mr1-cts-dev