Merge "Merge "Fix NPE when querying for already uninstalled package." into qt-dev am: 54dbca30ed am: 71419542ad" into qt-r1-dev-plus-aosp