Merge "Merge "Avoid stuck wake-locks" into qt-dev am: 13775aa4bb" into qt-dev-plus-aosp