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

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