Android CTS 8.1 Release 5 (4726866)
Merge "Snap for 4526935 from 5c1b707e70550d5878fa6b53fe32c08a07ae3264 to oreo-mr1-cts-release" into oreo-mr1-cts-release