[automerger skipped] Merge "Fix deadlock which causing ANR" am: 4b2247d506
am:e529a5b8ca-s ours am skip reason: change_id Idf0373ab0d5033d56da0f6f45d7d953f7e796813 with SHA1c8beb5c0f0is in history Change-Id: I93cd0362279355243b2a4504e4d750d7fbbb491b
This commit is contained in: