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