Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps: