[automerger skipped] Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7a2 am: 061fda060c am: 7f79ed1459
am: 355e5f95e5 -s ours
am skip reason: change_id Ied66c7f49e1c483870048563d08fb57410f004ef with SHA1 b420a64ebf is in history

Change-Id: I37d8f727188b9a11629726a8842c48577d4d258f