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

Change-Id: I738947a8330fd7e8b55d8a48a012a5b4e72b5b01