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