Merge changes Ia2bff16b,I0b17c3e8,Icc4a8190,I9b6ad0b3

* changes:
  Support for Watchable verification
  PackageManager lock reduction: IntentResolver
  PackageManager lock reduction: Settings on-change
  New watchables for PackageManagerService