Android CTS 5.0 release 4
merge in lmp-release history after reset to 5984fc03b6189f19f3721423b92469e4908a49ef