Merge "Restore WATCH_APPOPS permission for systemui" into qt-dev
am: 76de5167ab

Change-Id: I14fb29cc18bf78a92b499f43e708aa0af596272a