[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0
am:24fc368617-s ours am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1d78542bb52is in history Change-Id: Ia496e4e78cec60895d792976a47ff02a799bb03f
This commit is contained in: