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