Merge "Update deprecation javadocs of APIs related to preferred activities"