am 0dfb1df6: am 810d5ed2: Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev

* commit '0dfb1df6ac373120208d72abf00a3817e343069c':
  Use the correct lock to protect members in PolicyControl