am 507bd53a: Merge "Do not report the fake UI automation service to clients." into jb-mr2-dev

* commit '507bd53aa8906f7f3297684edb485706a4a573a1':
  Do not report the fake UI automation service to clients.