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