Merge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: f90c5c5f5a" into nyc-mr1-dev-plus-aosp
am: d9d2224a65
* commit 'd9d2224a65193d3d1ad6cb26bd933865a627556e':
Change-Id: I21181cee4613821841b29e4ef85f1ea2bfd93491
This commit is contained in: