am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev

* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles