Merge "Not throwing NPE when can't resolve test provider" into ub-launcher3-qt-qpr1-dev
am: 2c129d3d84

Change-Id: I9fa1006c6b8ffa4a80305309ef7df4976c725c39