[automerger skipped] Merge "Fix bluetooth can't turn off during network reset (2/3)" into qt-qpr1-dev am: e6627c7172 -s ours am: de4d38b6fa -s ours am: ef9944c9f8 -s ours
am skip reason: Change-Id I4bff3c3bb75fbb0d1e13c459c0d9d3fd3b8b3195 with SHA-1 d61f3f9ce1 is in history
Change-Id: I3795582b65d27da8422a0a6ae5c18415cf8d8130
This commit is contained in: