Android CTS 7.1 Release 23 (5054917)
Merge "Snap for 5050478 from bade5078888bce6e1f8888da87b779c259dc17fc to nougat-mr1-cts-release" into nougat-mr1-cts-release