Merge "Re-mark addPrivateFlags as UnsupportedAppUsage" into qt-dev
am: 1806895bc6

Change-Id: I44974f366dee4bd1cedc3e4287cc487ca977572c