Merge changes I632a9f25,If3c40976 into lmp-dev

* changes:
  Delete android.view.cts activities in AndroidManifest.xml
  Fix package names in android.provider