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

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