[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 9b47581ea4 am: c736f0a15c -s ours
am:cbd7d5d288-s ours am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA12bc992decbis in history Change-Id: Ibd4a98f0ce5f351ffc2f76d00762ffe78319dfe8
This commit is contained in: