Merge changes from topic "DoNotCallAppOpsFromPermMananager" into qt-dev
am: 0922770725

Change-Id: I63777a3fe68ca5d4cd7cec4025f52ee4790055db