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