Android CTS 6.0 Release 28 (4717452)
merge in marshmallow-cts-release history after reset to marshmallow-cts-dev