Merge change 20333

* changes:
  Clear app data via the Activity Manager, not Package Manager