Merge commit '003ac2c8e9a684a28180dac01340c759bf321cfd' * commit '003ac2c8e9a684a28180dac01340c759bf321cfd': Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '003ac2c8e9a684a28180dac01340c759bf321cfd' * commit '003ac2c8e9a684a28180dac01340c759bf321cfd': Fix #2262593: 42 ANR reports from android.process.acore