[automerger skipped] Merge "Fix deadlock which causing ANR" am: 4b2247d506 am: e529a5b8ca -s ours
am: ec882560da -s ours
am skip reason: change_id Idf0373ab0d5033d56da0f6f45d7d953f7e796813 with SHA1 c8beb5c0f0 is in history

Change-Id: I96e50c5d04fbd3c771eeb2b7c7eccb8890ead700