Merge "Merge "DO NOT MERGE: Bump Cts to 5.0R10" into lollipop-cts-dev am: c1182cad86  -s ours" into lollipop-mr1-cts-dev am: c395722ceb  -s ours am: d1411bad67  -s ours am: 20b48ec8bf am: eca1497d65 am: 5524840037 am: 8ca1fe2986  -s ours
am: 4edb328ff4

Change-Id: If59aaa10ce97348b65480f49a6fa78ec462b992f