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

Change-Id: I9eeccd25c3d5eb5378a131c8785a67a8f2f44467