Merge "resolve merge conflicts of 74ce520050 to lollipop-cts-dev" into lollipop-cts-dev
am: 6ae84c914c

* commit '6ae84c914c07c510e2ade42a4a2336afa78218ac':
  Add a host-side test to verify run-as works in adb shell.