Merge "Add method to retrieve the current appop mode" into stage-aosp-pi-cts-dev am: 6b2f46d8d4
am: 0f70ce48c8

Change-Id: I3c9987bd47b0fd7fb9354cc0604407a43c54023b