Merge "[automerger skipped] Merge "Add AppOps overload to be able to watch...

Merge "[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb am: 3f8ed181 -s ours am: f7f5abfb -s ours am: 6f0810ee -s ours am: b1ec1727 -s ours am: 76f52fb6 -s ours am: f63dfe9b -s ours am: cb634595 -s ours" into udc-qpr-dev-plus-aosp