am 01893119: Merge "UiAutomator test APK and Tests for CTS" into jb-dev

* commit '018931191b1e20e2e6ed454ad3da66db67f0f05f':
  UiAutomator test APK and Tests for CTS