Android CTS 5.0 release 6
merge in lmp-release history after reset to afe2b1fadd29149ceed639357e44e06e97c3a5ca