Merge "Temp move testPermissionDiffCert to postsubmit" into qt-dev
am: e0db5803f2

Change-Id: I039ab20e613108950af5b847edc0bc311dbf2934