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

Change-Id: I2d9a72eae56a4c078a7d52f4b6ca13827ffe191a