Android CTS 6.0 Release 28 (4717452)
Merge "Add new generated file."