Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7 am: 061fda06 am: 7f79ed14 Change-Id: I53c9479f77e31bf73f9f83bdd7739616b7d3548f