Merge "Remove setAppOps call" am: a40dfd20a2
am: d9dfd9ba39

Change-Id: Ibfc8634c901f93d3d0af36251aca16f56bad6cad