Merge "Remove setAppOps call"
am: a40dfd20a2

Change-Id: Icec27dcda13b829b72333402ae5aa4d8c85248be