Android CTS 6.0 Release 31 (4890202)
Merge "Add MODULE_LICENSE and NOTICE files"