Merge "Un-deprecate PackageManager.replacePreferredActivity." into qt-dev am: 552edb80ad
am: d8a04614a3

Change-Id: I352d9499ea43f3ecc136c644b0d36eea04fa9b6c