Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev