am 49216498: Merge "Remove Broken NoActivityRelatedPermissionTest" into froyo

* commit '4921649835854b316cc50c62a756330b20627f93':
  Remove Broken NoActivityRelatedPermissionTest