Merge "Merge "Temp move testPermissionDiffCert to postsubmit" into qt-dev am: e0db5803f2 am: c9c908f5ab" into qt-r1-dev-plus-aosp