Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7a2
am: 061fda060c

Change-Id: Ib5046d46850b37808b2bd262e739b69c811a601b