Android CTS 8.1 Release 13 (5240576)
Merge "Snap for 5063281 from fed6186c743607d4c2696cc27385a31567f63185 to oreo-mr1-cts-release" into oreo-mr1-cts-release