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

* commit '810d5ed23b89265946d7f0fd8b2e6002038f1f2c':
  Use the correct lock to protect members in PolicyControl