Merge "Merge "Restore WATCH_APPOPS permission for systemui" into qt-dev am: 76de5167ab am: bb349cb2a2" into qt-r1-dev-plus-aosp
am: 3be42de7a8

Change-Id: I759649c206dfea1802ab0c2e367d7f0d1f0e9ca7