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

Change-Id: Id4a322319e891a347fdb72b1e064828fd82070ee