Android CTS 8.1 Release 18 (6141226)
Snap for 4404534 from 9a053f7d10503860b54e6164149a07affed552ce to oc-mr1-release

Change-Id: I262ed6b0b938a45be9671b10d74beb67d460f5d2