Merge "Adding MANAGE_APP_OPS_MODES to FrameworksServicesTests" into pi-dev am: 4ac4ef7c9e
am: 5e0fad3ce6

Change-Id: Id6d32e0ee6d4fb3900099f8ce91a674161eddfe0