Merge changes Ie865aba7,Ic51a9ceb into udc-dev

* changes:
  [pm] do not stop system apps with disabled a launcher activity
  [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage