Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R5" into lollipop-cts-dev am: 442b187  -s ours
am: c488e96  -s ours

* commit 'c488e9637a35d444fb152933006ecec56737920a':
  DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R5