Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R6" into lollipop-mr1-cts-release