Android CTS 8.1 Release 10 (5009339)
Merge "Snap for 4787638 from 5552beb813d2a5ae60c4eef9a4a5646b7ab430d7 to oreo-mr1-cts-release" into oreo-mr1-cts-release